Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Sat, 9 Jan 2010 12:13:15 +0000 (13:13 +0100)
committerJan D. <jan.h.d@swipnet.se>
Sat, 9 Jan 2010 12:13:15 +0000 (13:13 +0100)
commit15f54f7f2f55180d35a0e434ce7a6285a63023ee
treeb09735d05ba26b7abf83287fac3c619501c93cf2
parenteb043bf2c723e2b677b66c8657f5976a96d9235b
parentf10177f49a3ea9cf164faeaa72b3f1d0406056d2
Merge from trunk